summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-13 13:16:19 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-02-13 13:19:22 +0100
commit8979d0194fa23395ec2c29b9e35aa4b13aeb96ea (patch)
treee8357914493af8d23c16e9f2af612430214537d7
parent670a71bf166820115c29230afc934f370ab5c810 (diff)
downloadChimère - projet Saclay-8979d0194fa23395ec2c29b9e35aa4b13aeb96ea.tar.bz2
Chimère - projet Saclay-8979d0194fa23395ec2c29b9e35aa4b13aeb96ea.zip
Mise en plein des liens vers les mobiles
-rw-r--r--static/saclay/css/saclay.css17
-rw-r--r--static/saclay/images/appstore.svg87
-rw-r--r--templates/chimere/main_map.html19
3 files changed, 69 insertions, 54 deletions
diff --git a/static/saclay/css/saclay.css b/static/saclay/css/saclay.css
index 30bad49..00e1a43 100644
--- a/static/saclay/css/saclay.css
+++ b/static/saclay/css/saclay.css
@@ -1,5 +1,22 @@
/* Saclay specific */
+a, a:link, a:visited, #footer .map-footer a, #footer .map-footer a:link, #footer .map-footer a:visited, #welcome .footer, caption {
+ color: #6f5d37;
+}
+
+#back-categories,
+div#panel{
+ bottom: 90px;
+}
+
+.store-image{
+ width: 125px;
+}
+
+#footer-panel{
+ height: 90px;
+}
+
.ol-scale-line,
.ol-attribution {
right: 3em;
diff --git a/static/saclay/images/appstore.svg b/static/saclay/images/appstore.svg
index 1fcbc58..27c3e85 100644
--- a/static/saclay/images/appstore.svg
+++ b/static/saclay/images/appstore.svg
@@ -32,8 +32,8 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="940"
- inkscape:window-height="472"
+ inkscape:window-width="1482"
+ inkscape:window-height="859"
id="namedview268"
showgrid="false"
fit-margin-top="0"
@@ -400,52 +400,37 @@
id="path247"
inkscape:connector-curvature="0"
style="fill:#ffffff" /></g></g></g><g
- id="text"
- transform="matrix(0.13478453,0,0,0.13478453,10.352301,0.30878443)"><rect
- x="218.04201"
- y="124.25"
- width="722"
- height="188.5"
- id="rect250"
- style="fill:none" /><text
- id="text252"
- x="186.08478"
- y="199.85587"><tspan
- x="186.08478"
- y="199.85587"
- font-size="156"
- letter-spacing="-3"
- id="tspan254"
- style="font-size:156px;letter-spacing:-3;fill:#ffffff;font-family:MyriadPro-Regular">App</tspan><tspan
- x="448.78378"
- y="199.85587"
- font-size="156"
- letter-spacing="-10"
- id="tspan256"
- style="font-size:156px;letter-spacing:-10;fill:#ffffff;font-family:MyriadPro-Regular" /><tspan
- x="471.24579"
- y="199.85587"
- font-size="156"
- letter-spacing="-3"
- id="tspan258"
- style="font-size:156px;letter-spacing:-3;fill:#ffffff;font-family:MyriadPro-Regular">Store</tspan></text>
-<rect
- x="219.5"
- y="49.75"
- width="618"
- height="84"
- id="rect260"
- style="fill:none" /><text
- transform="translate(219.5,106.5493)"
- display="none"
- font-size="80"
- letter-spacing="3"
- id="text262"
- style="font-size:80px;letter-spacing:3;fill:#ffffff;display:none;font-family:MyriadPro-Semibold">Available on the</text>
-<rect
- x="219.85001"
- y="49.02"
- width="712.46399"
- height="110.992"
- id="rect264"
- style="fill:none" /></g></svg> \ No newline at end of file
+ style="font-size:1.61741436px"
+ id="text252"><path
+ d="m 42.021207,13.561571 -2.813101,7.628226 5.636468,0 -2.823367,-7.628226 m -1.170414,-2.043091 2.351095,0 5.841803,15.328318 -2.156026,0 -1.396283,-3.932181 -6.90955,0 -1.396283,3.932181 -2.186827,0 5.852071,-15.328318"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3316" /><path
+ d="m 52.612586,25.121977 0,6.098474 -1.899356,0 0,-15.872458 1.899356,0 0,1.745354 c 0.396978,-0.684442 0.896628,-1.190936 1.498952,-1.519485 0.609156,-0.33537 1.334676,-0.503061 2.176559,-0.503072 1.396275,1.1e-5 2.529043,0.554418 3.398308,1.66322 0.876087,1.108822 1.314137,2.566705 1.314149,4.373652 -1.2e-5,1.806959 -0.438062,3.264842 -1.314149,4.373653 -0.869265,1.108813 -2.002033,1.66322 -3.398308,1.66322 -0.841883,0 -1.567403,-0.164269 -2.176559,-0.492806 -0.602324,-0.335381 -1.101974,-0.845298 -1.498952,-1.529752 m 6.427011,-4.014315 c -1e-5,-1.389432 -0.28748,-2.47771 -0.862411,-3.264839 -0.568104,-0.793955 -1.351802,-1.190937 -2.351095,-1.190948 -0.999306,1.1e-5 -1.786426,0.396993 -2.361361,1.190948 -0.5681,0.787129 -0.852148,1.875407 -0.852144,3.264839 -4e-6,1.389444 0.284044,2.481144 0.852144,3.275106 0.574935,0.787123 1.362055,1.180682 2.361361,1.180681 0.999293,1e-6 1.782991,-0.393558 2.351095,-1.180681 0.574931,-0.793962 0.862401,-1.885662 0.862411,-3.275106"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3318" /><path
+ d="m 65.55506,25.121977 0,6.098474 -1.899357,0 0,-15.872458 1.899357,0 0,1.745354 c 0.396978,-0.684442 0.896628,-1.190936 1.498951,-1.519485 0.609157,-0.33537 1.334676,-0.503061 2.176559,-0.503072 1.396275,1.1e-5 2.529043,0.554418 3.398308,1.66322 0.876088,1.108822 1.314137,2.566705 1.314149,4.373652 -1.2e-5,1.806959 -0.438061,3.264842 -1.314149,4.373653 -0.869265,1.108813 -2.002033,1.66322 -3.398308,1.66322 -0.841883,0 -1.567402,-0.164269 -2.176559,-0.492806 -0.602323,-0.335381 -1.101973,-0.845298 -1.498951,-1.529752 m 6.42701,-4.014315 c -10e-6,-1.389432 -0.28748,-2.47771 -0.86241,-3.264839 -0.568105,-0.793955 -1.351802,-1.190937 -2.351095,-1.190948 -0.999307,1.1e-5 -1.786427,0.396993 -2.361362,1.190948 -0.5681,0.787129 -0.852147,1.875407 -0.852143,3.264839 -4e-6,1.389444 0.284043,2.481144 0.852143,3.275106 0.574935,0.787123 1.362055,1.180682 2.361362,1.180681 0.999293,1e-6 1.78299,-0.393558 2.351095,-1.180681 0.57493,-0.793962 0.8624,-1.885662 0.86241,-3.275106"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3320" /><path
+ d="m 84.522147,12.021553 0,2.022558 c -0.787131,-0.376436 -1.529762,-0.657062 -2.227894,-0.841877 -0.69815,-0.184789 -1.372335,-0.27719 -2.022557,-0.277204 -1.129353,1.4e-5 -2.002029,0.219039 -2.618032,0.657075 -0.609166,0.438063 -0.913748,1.060914 -0.913744,1.868556 -4e-6,0.677619 0.20191,1.190958 0.605741,1.540018 0.410667,0.342236 1.184097,0.619439 2.320294,0.83161 l 1.252549,0.25667 c 1.546853,0.294323 2.686466,0.814507 3.418841,1.560552 0.739197,0.739216 1.108801,1.731671 1.108813,2.977369 -1.2e-5,1.485265 -0.499662,2.611189 -1.498951,3.377774 -0.992466,0.766587 -2.450349,1.149881 -4.373653,1.149881 -0.725525,0 -1.498956,-0.08214 -2.320295,-0.246403 -0.814501,-0.164269 -1.6598,-0.407249 -2.535897,-0.728942 l 0,-2.135493 c 0.841875,0.472275 1.666639,0.82819 2.474297,1.067747 0.807649,0.23956 1.601613,0.359339 2.381895,0.359337 1.184096,2e-6 2.097839,-0.232712 2.741233,-0.698141 0.643376,-0.465426 0.965068,-1.129344 0.965078,-1.991758 -1e-5,-0.752893 -0.232723,-1.341522 -0.698141,-1.765888 C 82.123131,20.58064 81.366812,20.26237 80.312763,20.050183 L 79.049948,19.80378 C 77.50308,19.495784 76.384001,19.013245 75.692707,18.356162 75.001408,17.699097 74.65576,16.785354 74.655762,15.61493 c -2e-6,-1.355204 0.475692,-2.422949 1.427083,-3.203239 0.95823,-0.780261 2.2758,-1.170399 3.952715,-1.170414 0.718667,1.5e-5 1.451031,0.06504 2.197093,0.195069 0.746043,0.130061 1.509207,0.32513 2.289494,0.585207"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3322" /><path
+ d="m 90.062266,12.083154 0,3.264839 3.891113,0 0,1.468151 -3.891113,0 0,6.242208 c -4e-6,0.937703 0.126619,1.540021 0.379871,1.806955 0.260087,0.266939 0.783693,0.400407 1.570819,0.400405 l 1.940423,0 0,1.581086 -1.940423,0 c -1.457889,0 -2.464033,-0.270359 -3.018437,-0.811076 -0.554409,-0.547561 -0.831612,-1.540017 -0.83161,-2.97737 l 0,-6.242208 -1.386016,0 0,-1.468151 1.386016,0 0,-3.264839 1.899357,0"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3324" /><path
+ d="m 100.49964,16.672409 c -1.012993,1e-5 -1.813802,0.396992 -2.402427,1.190948 -0.588633,0.787128 -0.882947,1.868562 -0.882944,3.244305 -3e-6,1.375754 0.290889,2.460611 0.872677,3.254573 0.588625,0.787122 1.392856,1.180682 2.412694,1.180681 1.00614,10e-7 1.80353,-0.396981 2.39216,-1.190948 0.58862,-0.793962 0.88294,-1.875396 0.88295,-3.244306 -1e-5,-1.362053 -0.29433,-2.440065 -0.88295,-3.234039 -0.58863,-0.8008 -1.38602,-1.201204 -2.39216,-1.201214 m 0,-1.601619 c 1.64268,1.1e-5 2.93287,0.533884 3.87058,1.601619 0.93769,1.067755 1.40654,2.546171 1.40655,4.435253 -1e-5,1.882249 -0.46886,3.360665 -1.40655,4.435254 -0.93771,1.067746 -2.2279,1.601619 -3.87058,1.601619 -1.649534,0 -2.943148,-0.533873 -3.880845,-1.601619 -0.930857,-1.074589 -1.396284,-2.553005 -1.396283,-4.435254 -10e-7,-1.889082 0.465426,-3.367498 1.396283,-4.435253 0.937697,-1.067735 2.231311,-1.601608 3.880845,-1.601619"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3326" /><path
+ d="m 115.15667,17.113881 c -0.21219,-0.123192 -0.4449,-0.212171 -0.69814,-0.266937 -0.24641,-0.06159 -0.52019,-0.09239 -0.82135,-0.0924 -1.06775,10e-6 -1.88909,0.349081 -2.46403,1.047213 -0.5681,0.691305 -0.85214,1.687183 -0.85214,2.987636 l 0,6.057406 -1.89936,0 0,-11.498805 1.89936,0 0,1.786421 c 0.39698,-0.698131 0.91374,-1.214892 1.55029,-1.550285 0.63653,-0.342215 1.40996,-0.513328 2.32029,-0.513339 0.13004,1.1e-5 0.27377,0.01028 0.43121,0.0308 0.15741,0.0137 0.33195,0.03766 0.5236,0.07187 l 0.0103,1.940423"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3328" /><path
+ d="m 126.13819,20.625123 0,0.924011 -8.68571,0 c 0.0821,1.300464 0.47227,2.29292 1.17041,2.977369 0.70499,0.67761 1.68375,1.016414 2.93631,1.016413 0.72551,10e-7 1.42707,-0.08898 2.10469,-0.266937 0.68444,-0.177956 1.36205,-0.444892 2.03282,-0.80081 l 0,1.786422 c -0.67762,0.28747 -1.37233,0.506495 -2.08416,0.657074 -0.71183,0.15058 -1.43393,0.22587 -2.16629,0.22587 -1.83434,0 -3.2888,-0.533873 -4.36338,-1.601619 -1.06775,-1.067744 -1.60162,-2.511938 -1.60162,-4.332586 0,-1.882237 0.50649,-3.374343 1.51948,-4.47632 1.01983,-1.108802 2.39216,-1.663209 4.11698,-1.66322 1.54686,1.1e-5 2.76861,0.499661 3.66525,1.498951 0.90347,0.992466 1.3552,2.344258 1.35522,4.055382 m -1.88909,-0.554407 c -0.0137,-1.033515 -0.3046,-1.85828 -0.87268,-2.474296 -0.56126,-0.615998 -1.30731,-0.924001 -2.23816,-0.924011 -1.05406,1e-5 -1.89936,0.297747 -2.5359,0.893211 -0.6297,0.595482 -0.99246,1.433936 -1.08828,2.515363 l 6.73502,-0.01027"
+ style="font-size:21.02638626px;letter-spacing:-0.40435359;fill:#ffffff;font-family:MyriadPro-Regular"
+ id="path3330" /></g><text
+ style="font-size:10.78276253px;letter-spacing:0.40435359;fill:#ffffff;display:none;font-family:MyriadPro-Semibold"
+ id="text262"
+ letter-spacing="3"
+ font-size="80"
+ display="none"
+ x="39.937504"
+ y="14.669982">Available on the</text>
+</svg> \ No newline at end of file
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index a2878d3..e37ad80 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -1,5 +1,5 @@
{% extends "chimere/base.html" %}
-{% load i18n unlocalize_point chimere_tags %}
+{% load i18n static unlocalize_point chimere_tags %}
{% block extra_head %}
{% head_jquery %}
{% head_chimere %}
@@ -72,11 +72,24 @@
<i class="fa fa-arrow-circle-left" aria-hidden="true"></i> <p>REVENIR AUX CATÉGORIES</p>
</div>
<div class='footer' id='footer-panel'>
+ <p>Disponible en téléchargement sur mobile</p>
+ <div id="store">
+ <a href="https://play.google.com/store/apps/details?id=com.saclay.saclaycarteouverte"
+ target="_blank">
+ <img src="{% static 'saclay/images/googleplay.svg' %}"
+ alt="Google play" class="store-image"/>
+ </a>
+ <a href="https://itunes.apple.com/fr/app/carto/id768621760?mt=8"
+ target="_blank">
+ <img src="{% static 'saclay/images/appstore.svg' %}"
+ alt="App store" class="store-image"/>
+ </a>
+ </div>
<span id='action-project' class='dyn-page'>
<a href='/dyn/project/'>le projet</a>
</span> |
{% if contact_email %}<a href='mailto:{{contact_email}}' id='contactus'>{% trans "contact" %}</a> | {% endif %}
- <a href='{% url 'chimere:extra_page' '' 'legal' %}' id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a>
+ <a href="{% url 'chimere:extra_page' '' 'legal' %}" id='page-legal' class='dyn-page'>{% trans "terms of service & credits" %}</a>
</div>
</div>
{% endblock %}
@@ -114,7 +127,7 @@
{% if itinerary_form %}<div id='routing-button' class="action-button">
<i class="fa fa-map-signs" aria-hidden="true"></i></div>{% endif %}
<div id='default-message'></div>
- <a href='{% url 'chimere:extra_page' '' 'feedback' %}' id='page-feedback' class='dyn-page'>Suggestions</a>
+ <a href="{% url 'chimere:extra_page' '' 'feedback' %}" id='page-feedback' class='dyn-page'>Suggestions</a>
<script type="text/javascript">
<!--
$("#main-map").show();